Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 05:30:45 +0000 (22:30 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 15 Aug 2011 05:30:45 +0000 (22:30 -0700)
commit7bd15b0a721c369da625429fce7d220ab4053a8f
tree6aa3dd7a9771162fc678d054d9af7f462f4c049e
parentf164f47a153d9ee32530f7ef80551d1e316fc0e7
parent997aa54195bbfa074c041a6f383399b35eb591c9
Merge from trunk.
src/ChangeLog
src/nsterm.h
src/nsterm.m
src/process.c
src/xdisp.c
src/xfaces.c